Improve e2e HostExec utility #84444
Merged
Improve e2e HostExec utility #84444
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
release-note-none
k8s-ci-robot
added
area/test
sig/storage
cofyc
commented
Oct 28, 2019
| // This works like ssh.SSH(...) utility. | ||
| func (h *hostExecutor) Execute(cmd string, node *v1.Node) (Result, error) { | ||
| result, err := h.exec(cmd, node) | ||
| if codeExitErr, ok := err.(exec.CodeExitError); ok { |
There was a problem hiding this comment.
cofyc
commented
Oct 28, 2019
| e2elog.Logf("exec %s: command: %s", remote, result.Cmd) | ||
| e2elog.Logf("exec %s: stdout: %q", remote, result.Stdout) | ||
| e2elog.Logf("exec %s: stderr: %q", remote, result.Stderr) | ||
| e2elog.Logf("exec %s: exit code: %d", remote, result.Code) |
There was a problem hiding this comment.
like ssh.LogResult, here are some examples:
Oct 28 19:14:21.053: INFO: exec k8s-testing-worker: command: ls -1 /mnt/disks/by-uuid/google-local-ssds-scsi-fs/ | wc -l
Oct 28 19:14:21.053: INFO: exec k8s-testing-worker: stdout: "0\n"
Oct 28 19:14:21.053: INFO: exec k8s-testing-worker: stderr: "ls: cannot access '/mnt/disks/by-uuid/google-local-ssds-scsi-fs/': No such file or directory\n"
Oct 28 19:14:21.053: INFO: exec k8s-testing-worker: exit code: 0
failed command log:
Oct 28 18:59:52.926: INFO: exec k8s-testing-worker: command: ls -1 /mnt/disks/by-uuid/google-local-ssds-scsi-fs/
Oct 28 18:59:52.926: INFO: exec k8s-testing-worker: stdout: ""
Oct 28 18:59:52.926: INFO: exec k8s-testing-worker: stderr: "ls: cannot access '/mnt/disks/by-uuid/google-local-ssds-scsi-fs/': No such file or directory\n"
Oct 28 18:59:52.926: INFO: exec k8s-testing-worker: exit code: 2
cofyc
commented
Oct 28, 2019
| // HostExec represents interface we require to execute commands on remote host. | ||
| type HostExec interface { | ||
| Execute(cmd string, node *v1.Node) (Result, error) |
There was a problem hiding this comment.
New method to replace ssh.SSH.
- separate stdout and stderr - return command exit code - remove kubectl dependency
|
/priority important-soon |
k8s-ci-robot
added
priority/important-soon
cofyc
commented
Oct 28, 2019
| @@ -1182,9 +1182,10 @@ func validateStatefulSet(config *localTestConfig, ss *appsv1.StatefulSet, anti b | |||
| // and skips if a disk of that type does not exist on the node | |||
| func SkipUnlessLocalSSDExists(config *localTestConfig, ssdInterface, filesystemType string, node *v1.Node) { | |||
| ssdCmd := fmt.Sprintf("ls -1 /mnt/disks/by-uuid/google-local-ssds-%s-%s/ | wc -l", ssdInterface, filesystemType) | |||
| res, err := config.hostExec.IssueCommandWithResult(ssdCmd, node) | |||
| res, err := config.hostExec.Execute(ssdCmd, node) | |||
| utils.LogResult(res) | |||
There was a problem hiding this comment.
as an example usage of Execute method. I didn't remove all IssueCommand/IssueCommandWithResult use cases. These two methods are simple to use sometimes.
cofyc
commented
Oct 28, 2019
| e2epod "k8s.io/kubernetes/test/e2e/framework/pod" | ||
| ) | ||
|
|
||
| // Result holds the execution result of remote execution command. | ||
| type Result struct { |
There was a problem hiding this comment.
Like ssh.Result except no User field
|
/retest |
msau42
reviewed
Oct 28, 2019
| result := Result{ | ||
| Host: node.Name, | ||
| Cmd: cmd, | ||
| } | ||
| pod, ok := h.nodeExecPods[node.Name] |
There was a problem hiding this comment.
I remember @jsafrane hit some issue with creating two host exec pods in the same test. Did that ever get resolved? How about hostexec for two tests running in parallel?
There was a problem hiding this comment.
A limitation is this utility cannot be shared by multiple parallel tests. We can add support when necessary.
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cofyc, msau42 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
/kind cleanup
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #84233
Special notes for your reviewer:
Does this PR introduce a user-facing change?:
Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.: